Autogenerated HTML docs for v1.8.2.1-538-gad776
diff --git a/config.txt b/config.txt index 29559c8..c67038b 100644 --- a/config.txt +++ b/config.txt
@@ -412,7 +412,7 @@ core.logAllRefUpdates:: Enable the reflog. Updates to a ref <ref> is logged to the file "$GIT_DIR/logs/<ref>", by appending the new and old - SHA1, the date/time and the reason of the update, but + SHA-1, the date/time and the reason of the update, but only when the file exists. If this configuration variable is set to true, missing "$GIT_DIR/logs/<ref>" file is automatically created for branch heads (i.e. under
diff --git a/git-cat-file.html b/git-cat-file.html index 3a36fbc..6a96e9f 100644 --- a/git-cat-file.html +++ b/git-cat-file.html
@@ -760,7 +760,7 @@ object type, or <em>-s</em> is used to find the object size, or <em>--textconv</em> is used (which implies type "blob").</p></div> <div class="paragraph"><p>In the second form, a list of objects (separated by linefeeds) is provided on -stdin, and the SHA1, type, and size of each object is printed on stdout.</p></div> +stdin, and the SHA-1, type, and size of each object is printed on stdout.</p></div> </div> </div> <div class="sect1"> @@ -840,7 +840,7 @@ </dt> <dd> <p> - Print the SHA1, type, size, and contents of each object provided on + Print the SHA-1, type, size, and contents of each object provided on stdin. May not be combined with any other options or arguments. </p> </dd> @@ -849,7 +849,7 @@ </dt> <dd> <p> - Print the SHA1, type, and size of each object provided on stdin. May not + Print the SHA-1, type, and size of each object provided on stdin. May not be combined with any other options or arguments. </p> </dd> @@ -896,7 +896,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2011-11-15 13:45:02 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-cat-file.txt b/git-cat-file.txt index 2fb95bb..30d585a 100644 --- a/git-cat-file.txt +++ b/git-cat-file.txt
@@ -20,7 +20,7 @@ (which implies type "blob"). In the second form, a list of objects (separated by linefeeds) is provided on -stdin, and the SHA1, type, and size of each object is printed on stdout. +stdin, and the SHA-1, type, and size of each object is printed on stdout. OPTIONS ------- @@ -58,11 +58,11 @@ to apply the filter to the content recorded in the index at <path>. --batch:: - Print the SHA1, type, size, and contents of each object provided on + Print the SHA-1, type, size, and contents of each object provided on stdin. May not be combined with any other options or arguments. --batch-check:: - Print the SHA1, type, and size of each object provided on stdin. May not + Print the SHA-1, type, and size of each object provided on stdin. May not be combined with any other options or arguments. OUTPUT
diff --git a/git-config.html b/git-config.html index 79cb588..bcaaa63 100644 --- a/git-config.html +++ b/git-config.html
@@ -1837,7 +1837,7 @@ <p> Enable the reflog. Updates to a ref <ref> is logged to the file "$GIT_DIR/logs/<ref>", by appending the new and old - SHA1, the date/time and the reason of the update, but + SHA-1, the date/time and the reason of the update, but only when the file exists. If this configuration variable is set to true, missing "$GIT_DIR/logs/<ref>" file is automatically created for branch heads (i.e. under
diff --git a/git-describe.html b/git-describe.html index 1f2f5d3..a4c2aa6 100644 --- a/git-describe.html +++ b/git-describe.html
@@ -958,7 +958,7 @@ <div class="paragraph"><p>If an exact match was not found, <em>git describe</em> will walk back through the commit history to locate an ancestor commit which has been tagged. The ancestor’s tag will be output along with an -abbreviation of the input committish’s SHA1.</p></div> +abbreviation of the input committish’s SHA-1.</p></div> <div class="paragraph"><p>If multiple tags were found during the walk then the tag which has the fewest commits different from the input committish will be selected and output. Here fewest commits different is defined as @@ -976,7 +976,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-03-19 16:06:22 PDT +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-describe.txt b/git-describe.txt index 3c81e85..28e5ec0 100644 --- a/git-describe.txt +++ b/git-describe.txt
@@ -149,7 +149,7 @@ If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged. The ancestor's tag will be output along with an -abbreviation of the input committish's SHA1. +abbreviation of the input committish's SHA-1. If multiple tags were found during the walk then the tag which has the fewest commits different from the input committish will be
diff --git a/git-diff-tree.html b/git-diff-tree.html index 4e5f42e..f2dcfbe 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -1978,7 +1978,7 @@ <em>raw</em> </p> <div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as -stored in the commit object. Notably, the SHA1s are +stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the true parent commits, without taking grafts nor history
diff --git a/git-fsck.html b/git-fsck.html index b94ef0c..e7a858f 100644 --- a/git-fsck.html +++ b/git-fsck.html
@@ -771,7 +771,7 @@ An object to treat as the head of an unreachability trace. </p> <div class="paragraph"><p>If no objects are given, <em>git fsck</em> defaults to using the -index file, all SHA1 references in <code>refs</code> namespace, and all reflogs +index file, all SHA-1 references in <code>refs</code> namespace, and all reflogs (unless --no-reflogs is given) as heads.</p></div> </dd> <dt class="hdlist1"> @@ -899,7 +899,7 @@ <div class="sect1"> <h2 id="_discussion">DISCUSSION</h2> <div class="sectionbody"> -<div class="paragraph"><p>git-fsck tests SHA1 and general object sanity, and it does full tracking +<div class="paragraph"><p>git-fsck tests SHA-1 and general object sanity, and it does full tracking of the resulting reachability and everything else. It prints out any corruption it finds (missing or bad objects), and if you use the <em>--unreachable</em> flag it will also print out objects that exist but that @@ -1017,7 +1017,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-fsck.txt b/git-fsck.txt index eff9188..e5878bd 100644 --- a/git-fsck.txt +++ b/git-fsck.txt
@@ -23,7 +23,7 @@ An object to treat as the head of an unreachability trace. + If no objects are given, 'git fsck' defaults to using the -index file, all SHA1 references in `refs` namespace, and all reflogs +index file, all SHA-1 references in `refs` namespace, and all reflogs (unless --no-reflogs is given) as heads. --unreachable:: @@ -89,7 +89,7 @@ DISCUSSION ---------- -git-fsck tests SHA1 and general object sanity, and it does full tracking +git-fsck tests SHA-1 and general object sanity, and it does full tracking of the resulting reachability and everything else. It prints out any corruption it finds (missing or bad objects), and if you use the '--unreachable' flag it will also print out objects that exist but that
diff --git a/git-http-backend.html b/git-http-backend.html index 73063fd..e77273c 100644 --- a/git-http-backend.html +++ b/git-http-backend.html
@@ -847,7 +847,29 @@ ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/</code></pre> </div></div> <div class="paragraph"><p>To enable anonymous read access but authenticated write access, -require authorization with a LocationMatch directive:</p></div> +require authorization for both the initial ref advertisement (which we +detect as a push via the service parameter in the query string), and the +receive-pack invocation itself:</p></div> +<div class="listingblock"> +<div class="content"> +<pre><code>RewriteCond %{QUERY_STRING} service=git-receive-pack [OR] +RewriteCond %{REQUEST_URI} /git-receive-pack$ +RewriteRule ^/git/ - [E=AUTHREQUIRED:yes] + +<LocationMatch "^/git/"> + Order Deny,Allow + Deny from env=AUTHREQUIRED + + AuthType Basic + AuthName "Git Access" + Require group committers + Satisfy Any + ... +</LocationMatch></code></pre> +</div></div> +<div class="paragraph"><p>If you do not have <code>mod_rewrite</code> available to match against the query +string, it is sufficient to just protect <code>git-receive-pack</code> itself, +like:</p></div> <div class="listingblock"> <div class="content"> <pre><code><LocationMatch "^/git/.*/git-receive-pack$"> @@ -857,6 +879,14 @@ ... </LocationMatch></code></pre> </div></div> +<div class="paragraph"><p>In this mode, the server will not request authentication until the +client actually starts the object negotiation phase of the push, rather +than during the initial contact. For this reason, you must also enable +the <code>http.receivepack</code> config option in any repositories that should +accept a push. The default behavior, if <code>http.receivepack</code> is not set, +is to reject any pushes by unauthenticated users; the initial request +will therefore report <code>403 Forbidden</code> to the client, without even giving +an opportunity for authentication.</p></div> <div class="paragraph"><p>To require authentication for both reads and writes, use a Location directive around the repository, or one of its parent directories:</p></div> <div class="listingblock"> @@ -926,6 +956,56 @@ ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/</code></pre> </div></div> </dd> +<dt class="hdlist1"> +Lighttpd +</dt> +<dd> +<p> + Ensure that <code>mod_cgi</code>, <code>mod_alias, `mod_auth</code>, <code>mod_setenv</code> are + loaded, then set <code>GIT_PROJECT_ROOT</code> appropriately and redirect + all requests to the CGI: +</p> +<div class="listingblock"> +<div class="content"> +<pre><code>alias.url += ( "/git" => "/usr/lib/git-core/git-http-backend" ) +$HTTP["url"] =~ "^/git" { + cgi.assign = ("" => "") + setenv.add-environment = ( + "GIT_PROJECT_ROOT" => "/var/www/git", + "GIT_HTTP_EXPORT_ALL" => "" + ) +}</code></pre> +</div></div> +<div class="paragraph"><p>To enable anonymous read access but authenticated write access:</p></div> +<div class="listingblock"> +<div class="content"> +<pre><code>$HTTP["querystring"] =~ "service=git-receive-pack" { + include "git-auth.conf" +} +$HTTP["url"] =~ "^/git/.*/git-receive-pack$" { + include "git-auth.conf" +}</code></pre> +</div></div> +<div class="paragraph"><p>where <code>git-auth.conf</code> looks something like:</p></div> +<div class="listingblock"> +<div class="content"> +<pre><code>auth.require = ( + "/" => ( + "method" => "basic", + "realm" => "Git Access", + "require" => "valid-user" + ) +) +# ...and set up auth.backend here</code></pre> +</div></div> +<div class="paragraph"><p>To require authentication for both reads and writes:</p></div> +<div class="listingblock"> +<div class="content"> +<pre><code>$HTTP["url"] =~ "^/git/private" { + include "git-auth.conf" +}</code></pre> +</div></div> +</dd> </dl></div> </div> </div> @@ -999,7 +1079,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body> diff --git a/git-http-backend.txt b/git-http-backend.txt index 7b1e85c..e3bcdb5 100644 --- a/git-http-backend.txt +++ b/git-http-backend.txt
@@ -80,7 +80,30 @@ ---------------------------------------------------------------- + To enable anonymous read access but authenticated write access, -require authorization with a LocationMatch directive: +require authorization for both the initial ref advertisement (which we +detect as a push via the service parameter in the query string), and the +receive-pack invocation itself: ++ +---------------------------------------------------------------- +RewriteCond %{QUERY_STRING} service=git-receive-pack [OR] +RewriteCond %{REQUEST_URI} /git-receive-pack$ +RewriteRule ^/git/ - [E=AUTHREQUIRED:yes] + +<LocationMatch "^/git/"> + Order Deny,Allow + Deny from env=AUTHREQUIRED + + AuthType Basic + AuthName "Git Access" + Require group committers + Satisfy Any + ... +</LocationMatch> +---------------------------------------------------------------- ++ +If you do not have `mod_rewrite` available to match against the query +string, it is sufficient to just protect `git-receive-pack` itself, +like: + ---------------------------------------------------------------- <LocationMatch "^/git/.*/git-receive-pack$"> @@ -91,6 +114,15 @@ </LocationMatch> ---------------------------------------------------------------- + +In this mode, the server will not request authentication until the +client actually starts the object negotiation phase of the push, rather +than during the initial contact. For this reason, you must also enable +the `http.receivepack` config option in any repositories that should +accept a push. The default behavior, if `http.receivepack` is not set, +is to reject any pushes by unauthenticated users; the initial request +will therefore report `403 Forbidden` to the client, without even giving +an opportunity for authentication. ++ To require authentication for both reads and writes, use a Location directive around the repository, or one of its parent directories: + @@ -158,6 +190,54 @@ ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/ ---------------------------------------------------------------- +Lighttpd:: + Ensure that `mod_cgi`, `mod_alias, `mod_auth`, `mod_setenv` are + loaded, then set `GIT_PROJECT_ROOT` appropriately and redirect + all requests to the CGI: ++ +---------------------------------------------------------------- +alias.url += ( "/git" => "/usr/lib/git-core/git-http-backend" ) +$HTTP["url"] =~ "^/git" { + cgi.assign = ("" => "") + setenv.add-environment = ( + "GIT_PROJECT_ROOT" => "/var/www/git", + "GIT_HTTP_EXPORT_ALL" => "" + ) +} +---------------------------------------------------------------- ++ +To enable anonymous read access but authenticated write access: ++ +---------------------------------------------------------------- +$HTTP["querystring"] =~ "service=git-receive-pack" { + include "git-auth.conf" +} +$HTTP["url"] =~ "^/git/.*/git-receive-pack$" { + include "git-auth.conf" +} +---------------------------------------------------------------- ++ +where `git-auth.conf` looks something like: ++ +---------------------------------------------------------------- +auth.require = ( + "/" => ( + "method" => "basic", + "realm" => "Git Access", + "require" => "valid-user" + ) +) +# ...and set up auth.backend here +---------------------------------------------------------------- ++ +To require authentication for both reads and writes: ++ +---------------------------------------------------------------- +$HTTP["url"] =~ "^/git/private" { + include "git-auth.conf" +} +---------------------------------------------------------------- + ENVIRONMENT ----------- diff --git a/git-index-pack.html b/git-index-pack.html index eebd3b2..3bc7c5f 100644 --- a/git-index-pack.html +++ b/git-index-pack.html
@@ -878,7 +878,7 @@ <h2 id="_note">Note</h2> <div class="sectionbody"> <div class="paragraph"><p>Once the index has been created, the list of object names is sorted -and the SHA1 hash of that list is printed to stdout. If --stdin was +and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either "pack\t", or "keep\t" if a new .keep file was successfully created. This is useful to remove a .keep file used as a lock to prevent the race with <em>git repack</em> @@ -895,7 +895,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-index-pack.txt b/git-index-pack.txt index 36adc5f..bde8eec 100644 --- a/git-index-pack.txt +++ b/git-index-pack.txt
@@ -89,7 +89,7 @@ ---- Once the index has been created, the list of object names is sorted -and the SHA1 hash of that list is printed to stdout. If --stdin was +and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either "pack\t", or "keep\t" if a new .keep file was successfully created. This is useful to remove a .keep file used as a lock to prevent the race with 'git repack'
diff --git a/git-log.html b/git-log.html index 64b4fe7..5b9687a 100644 --- a/git-log.html +++ b/git-log.html
@@ -2149,7 +2149,7 @@ <em>raw</em> </p> <div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as -stored in the commit object. Notably, the SHA1s are +stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the true parent commits, without taking grafts nor history
diff --git a/git-ls-files.html b/git-ls-files.html index 129f400..7ee5327 100644 --- a/git-ls-files.html +++ b/git-ls-files.html
@@ -1098,7 +1098,7 @@ </div></div> <div class="paragraph"><p><em>git ls-files --unmerged</em> and <em>git ls-files --stage</em> can be used to examine detailed information on unmerged paths.</p></div> -<div class="paragraph"><p>For an unmerged path, instead of recording a single mode/SHA1 pair, +<div class="paragraph"><p>For an unmerged path, instead of recording a single mode/SHA-1 pair, the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the @@ -1164,7 +1164,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-ls-files.txt b/git-ls-files.txt index 0bdebff..c0856a6 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt
@@ -164,7 +164,7 @@ 'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine detailed information on unmerged paths. -For an unmerged path, instead of recording a single mode/SHA1 pair, +For an unmerged path, instead of recording a single mode/SHA-1 pair, the index records up to three such pairs; one from tree O in stage 1, A in stage 2, and B in stage 3. This information can be used by the user (or the porcelain) to see what should eventually be recorded at the
diff --git a/git-merge-index.html b/git-merge-index.html index f7ac301..f7075c2 100644 --- a/git-merge-index.html +++ b/git-merge-index.html
@@ -755,7 +755,7 @@ <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> <div class="paragraph"><p>This looks up the <file>(s) in the index and, if there are any merge -entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty +entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty argument if no file), and <file> as argument 4. File modes for the three files are passed as arguments 5, 6 and 7.</p></div> </div> @@ -848,7 +848,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-merge-index.txt b/git-merge-index.txt index 0c80cec..02676fb 100644 --- a/git-merge-index.txt +++ b/git-merge-index.txt
@@ -14,7 +14,7 @@ DESCRIPTION ----------- This looks up the <file>(s) in the index and, if there are any merge -entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty +entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty argument if no file), and <file> as argument 4. File modes for the three files are passed as arguments 5, 6 and 7.
diff --git a/git-pack-objects.html b/git-pack-objects.html index da5818d..7f6c361 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html
@@ -792,7 +792,7 @@ Write into a pair of files (.pack and .idx), using <base-name> to determine the name of the created file. When this option is used, the two files are written in - <base-name>-<SHA1>.{pack,idx} files. <SHA1> is a hash + <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash of the sorted object names to make the resulting filename based on the pack content, and written to the standard output of the command. @@ -1108,7 +1108,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body> diff --git a/git-pack-objects.txt b/git-pack-objects.txt index 69c9313..d94edcd 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt
@@ -50,7 +50,7 @@ Write into a pair of files (.pack and .idx), using <base-name> to determine the name of the created file. When this option is used, the two files are written in - <base-name>-<SHA1>.{pack,idx} files. <SHA1> is a hash + <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash of the sorted object names to make the resulting filename based on the pack content, and written to the standard output of the command. diff --git a/git-patch-id.html b/git-patch-id.html index ed9b6fa..28bf531 100644 --- a/git-patch-id.html +++ b/git-patch-id.html
@@ -754,7 +754,7 @@ <div class="sect1"> <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<div class="paragraph"><p>A "patch ID" is nothing but a SHA1 of the diff associated with a patch, with +<div class="paragraph"><p>A "patch ID" is nothing but a SHA-1 of the diff associated with a patch, with whitespace and line numbers ignored. As such, it’s "reasonably stable", but at the same time also reasonably unique, i.e., two patches that have the same "patch ID" are almost guaranteed to be the same thing.</p></div> @@ -791,7 +791,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2011-11-15 13:45:02 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-patch-id.txt b/git-patch-id.txt index 90268f0..312c3b1 100644 --- a/git-patch-id.txt +++ b/git-patch-id.txt
@@ -12,7 +12,7 @@ DESCRIPTION ----------- -A "patch ID" is nothing but a SHA1 of the diff associated with a patch, with +A "patch ID" is nothing but a SHA-1 of the diff associated with a patch, with whitespace and line numbers ignored. As such, it's "reasonably stable", but at the same time also reasonably unique, i.e., two patches that have the same "patch ID" are almost guaranteed to be the same thing.
diff --git a/git-replace.html b/git-replace.html index e98cd11..db3da77 100644 --- a/git-replace.html +++ b/git-replace.html
@@ -757,8 +757,8 @@ <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> <div class="paragraph"><p>Adds a <em>replace</em> reference in <code>refs/replace/</code> namespace.</p></div> -<div class="paragraph"><p>The name of the <em>replace</em> reference is the SHA1 of the object that is -replaced. The content of the <em>replace</em> reference is the SHA1 of the +<div class="paragraph"><p>The name of the <em>replace</em> reference is the SHA-1 of the object that is +replaced. The content of the <em>replace</em> reference is the SHA-1 of the replacement object.</p></div> <div class="paragraph"><p>Unless <code>-f</code> is given, the <em>replace</em> reference must not yet exist.</p></div> <div class="paragraph"><p>Replacement references will be used by default by all Git commands @@ -847,7 +847,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-replace.txt b/git-replace.txt index 0142cd1..e0b4057 100644 --- a/git-replace.txt +++ b/git-replace.txt
@@ -16,8 +16,8 @@ ----------- Adds a 'replace' reference in `refs/replace/` namespace. -The name of the 'replace' reference is the SHA1 of the object that is -replaced. The content of the 'replace' reference is the SHA1 of the +The name of the 'replace' reference is the SHA-1 of the object that is +replaced. The content of the 'replace' reference is the SHA-1 of the replacement object. Unless `-f` is given, the 'replace' reference must not yet exist.
diff --git a/git-rev-list.html b/git-rev-list.html index 6f6d0c4..2a90431 100644 --- a/git-rev-list.html +++ b/git-rev-list.html
@@ -2179,7 +2179,7 @@ <em>raw</em> </p> <div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as -stored in the commit object. Notably, the SHA1s are +stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the true parent commits, without taking grafts nor history
diff --git a/git-rev-parse.html b/git-rev-parse.html index 61773ca..b5dd384 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html
@@ -906,7 +906,7 @@ </dt> <dd> <p> - Usually the object names are output in SHA1 form (with + Usually the object names are output in SHA-1 form (with possible <em>^</em> prefix); this option makes them output in a form as close to the original input as possible. </p> @@ -1070,7 +1070,7 @@ </dt> <dd> <p> - Instead of outputting the full SHA1 values of object names try to + Instead of outputting the full SHA-1 values of object names try to abbreviate them to a shorter unique name. When no length is specified 7 is used. The minimum length is 4. </p> @@ -1125,7 +1125,7 @@ <h2 id="_specifying_revisions">SPECIFYING REVISIONS</h2> <div class="sectionbody"> <div class="paragraph"><p>A revision parameter <em><rev></em> typically, but not necessarily, names a -commit object. It uses what is called an <em>extended SHA1</em> +commit object. It uses what is called an <em>extended SHA-1</em> syntax. Here are various ways to spell object names. The ones listed near the end of this list name trees and blobs contained in a commit.</p></div> @@ -1135,7 +1135,7 @@ </dt> <dd> <p> - The full SHA1 object name (40-byte hexadecimal string), or + The full SHA-1 object name (40-byte hexadecimal string), or a leading substring that is unique within the repository. E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both name the same commit object if there is no other object in @@ -1694,7 +1694,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-04-05 15:13:57 PDT +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 1f9ed6c..947d62f 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt
@@ -95,7 +95,7 @@ one. --symbolic:: - Usually the object names are output in SHA1 form (with + Usually the object names are output in SHA-1 form (with possible '{caret}' prefix); this option makes them output in a form as close to the original input as possible. @@ -180,7 +180,7 @@ --short:: --short=number:: - Instead of outputting the full SHA1 values of object names try to + Instead of outputting the full SHA-1 values of object names try to abbreviate them to a shorter unique name. When no length is specified 7 is used. The minimum length is 4. diff --git a/git-show-branch.html b/git-show-branch.html index 961c574..56361a7 100644 --- a/git-show-branch.html +++ b/git-show-branch.html
@@ -776,7 +776,7 @@ </dt> <dd> <p> - Arbitrary extended SHA1 expression (see <a href="gitrevisions.html">gitrevisions(7)</a>) + Arbitrary extended SHA-1 expression (see <a href="gitrevisions.html">gitrevisions(7)</a>) that typically names a branch head or a tag. </p> </dd> @@ -980,7 +980,7 @@ branch, the I-th indentation character shows a <code>+</code> sign; otherwise it shows a space. Merge commits are denoted by a <code>-</code> sign. Each commit shows a short name that -can be used as an extended SHA1 to name that commit.</p></div> +can be used as an extended SHA-1 to name that commit.</p></div> <div class="paragraph"><p>The following example shows three branches, "master", "fixes" and "mhf":</p></div> <div class="listingblock"> @@ -1043,7 +1043,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2011-11-15 13:45:02 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-show-branch.txt b/git-show-branch.txt index a8e77b5..a515648 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt
@@ -31,7 +31,7 @@ OPTIONS ------- <rev>:: - Arbitrary extended SHA1 expression (see linkgit:gitrevisions[7]) + Arbitrary extended SHA-1 expression (see linkgit:gitrevisions[7]) that typically names a branch head or a tag. <glob>:: @@ -142,7 +142,7 @@ branch, the I-th indentation character shows a `+` sign; otherwise it shows a space. Merge commits are denoted by a `-` sign. Each commit shows a short name that -can be used as an extended SHA1 to name that commit. +can be used as an extended SHA-1 to name that commit. The following example shows three branches, "master", "fixes" and "mhf":
diff --git a/git-show-index.html b/git-show-index.html index 10f7f9c..c812807 100644 --- a/git-show-index.html +++ b/git-show-index.html
@@ -758,7 +758,7 @@ <em>git pack-objects</em> command, and dumps its contents.</p></div> <div class="paragraph"><p>The information it outputs is subset of what you can get from <em>git verify-pack -v</em>; this command only shows the packfile -offset and SHA1 of each object.</p></div> +offset and SHA-1 of each object.</p></div> </div> </div> <div class="sect1"> @@ -771,7 +771,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-show-index.txt b/git-show-index.txt index 9cbbed9..fbdc8ad 100644 --- a/git-show-index.txt +++ b/git-show-index.txt
@@ -19,7 +19,7 @@ The information it outputs is subset of what you can get from 'git verify-pack -v'; this command only shows the packfile -offset and SHA1 of each object. +offset and SHA-1 of each object. GIT ---
diff --git a/git-show-ref.html b/git-show-ref.html index 989ce53..02ecbff 100644 --- a/git-show-ref.html +++ b/git-show-ref.html
@@ -812,8 +812,8 @@ </dt> <dd> <p> - Only show the SHA1 hash, not the reference name. When combined with - --dereference the dereferenced tag will still be shown after the SHA1. + Only show the SHA-1 hash, not the reference name. When combined with + --dereference the dereferenced tag will still be shown after the SHA-1. </p> </dd> <dt class="hdlist1"> @@ -970,7 +970,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-05-02 15:00:44 PDT +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-show-ref.txt b/git-show-ref.txt index 5dbcd47..de4d352 100644 --- a/git-show-ref.txt +++ b/git-show-ref.txt
@@ -50,8 +50,8 @@ -s:: --hash[=<n>]:: - Only show the SHA1 hash, not the reference name. When combined with - --dereference the dereferenced tag will still be shown after the SHA1. + Only show the SHA-1 hash, not the reference name. When combined with + --dereference the dereferenced tag will still be shown after the SHA-1. --verify::
diff --git a/git-show.html b/git-show.html index 903f1bf..4f25401 100644 --- a/git-show.html +++ b/git-show.html
@@ -1023,7 +1023,7 @@ <em>raw</em> </p> <div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as -stored in the commit object. Notably, the SHA1s are +stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the true parent commits, without taking grafts nor history
diff --git a/git-tag.html b/git-tag.html index d4af7df..085061d 100644 --- a/git-tag.html +++ b/git-tag.html
@@ -769,7 +769,7 @@ in the tag message.</p></div> <div class="paragraph"><p>If <code>-m <msg></code> or <code>-F <file></code> is given and <code>-a</code>, <code>-s</code>, and <code>-u <key-id></code> are absent, <code>-a</code> is implied.</p></div> -<div class="paragraph"><p>Otherwise just a tag reference for the SHA1 object name of the commit object is +<div class="paragraph"><p>Otherwise just a tag reference for the SHA-1 object name of the commit object is created (i.e. a lightweight tag).</p></div> <div class="paragraph"><p>A GnuPG signed tag object will be created when <code>-s</code> or <code>-u <key-id></code> is used. When <code>-u <key-id></code> is not used, the @@ -1190,7 +1190,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-04-03 13:30:46 PDT +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-tag.txt b/git-tag.txt index b21aa87..22894cb 100644 --- a/git-tag.txt +++ b/git-tag.txt
@@ -33,7 +33,7 @@ If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <key-id>` are absent, `-a` is implied. -Otherwise just a tag reference for the SHA1 object name of the commit object is +Otherwise just a tag reference for the SHA-1 object name of the commit object is created (i.e. a lightweight tag). A GnuPG signed tag object will be created when `-s` or `-u
diff --git a/git-update-index.html b/git-update-index.html index 2390e84..050f77e 100644 --- a/git-update-index.html +++ b/git-update-index.html
@@ -1119,7 +1119,7 @@ 100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz</code></pre> </div></div> <div class="paragraph"><p>The first line of the input feeds 0 as the mode to remove the -path; the SHA1 does not matter as long as it is well formatted. +path; the SHA-1 does not matter as long as it is well formatted. Then the second and third line feeds stage 1 and stage 2 entries for that path. After the above, we would end up with this:</p></div> <div class="listingblock"> @@ -1300,7 +1300,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-03-19 16:06:22 PDT +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-update-index.txt b/git-update-index.txt index c927758..670e9fb 100644 --- a/git-update-index.txt +++ b/git-update-index.txt
@@ -247,7 +247,7 @@ ------------ The first line of the input feeds 0 as the mode to remove the -path; the SHA1 does not matter as long as it is well formatted. +path; the SHA-1 does not matter as long as it is well formatted. Then the second and third line feeds stage 1 and stage 2 entries for that path. After the above, we would end up with this:
diff --git a/git-verify-pack.html b/git-verify-pack.html index ad4f8ef..606648b 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html
@@ -812,12 +812,12 @@ <div class="paragraph"><p>When specifying the -v option the format used is:</p></div> <div class="literalblock"> <div class="content"> -<pre><code>SHA1 type size size-in-pack-file offset-in-packfile</code></pre> +<pre><code>SHA-1 type size size-in-pack-file offset-in-packfile</code></pre> </div></div> <div class="paragraph"><p>for objects that are not deltified in the pack, and</p></div> <div class="literalblock"> <div class="content"> -<pre><code>SHA1 type size size-in-packfile offset-in-packfile depth base-SHA1</code></pre> +<pre><code>SHA-1 type size size-in-packfile offset-in-packfile depth base-SHA-1</code></pre> </div></div> <div class="paragraph"><p>for objects that are deltified.</p></div> </div> @@ -832,7 +832,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-verify-pack.txt b/git-verify-pack.txt index 0eb9ffb..526ba7b 100644 --- a/git-verify-pack.txt +++ b/git-verify-pack.txt
@@ -40,11 +40,11 @@ ------------- When specifying the -v option the format used is: - SHA1 type size size-in-pack-file offset-in-packfile + SHA-1 type size size-in-pack-file offset-in-packfile for objects that are not deltified in the pack, and - SHA1 type size size-in-packfile offset-in-packfile depth base-SHA1 + SHA-1 type size size-in-packfile offset-in-packfile depth base-SHA-1 for objects that are deltified.
diff --git a/git-verify-tag.html b/git-verify-tag.html index c7337aa..024ab49 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html
@@ -777,7 +777,7 @@ </dt> <dd> <p> - SHA1 identifiers of Git tag objects. + SHA-1 identifiers of Git tag objects. </p> </dd> </dl></div> @@ -793,7 +793,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git-verify-tag.txt b/git-verify-tag.txt index e996135..f88ba96 100644 --- a/git-verify-tag.txt +++ b/git-verify-tag.txt
@@ -21,7 +21,7 @@ Print the contents of the tag object before validating it. <tag>...:: - SHA1 identifiers of Git tag objects. + SHA-1 identifiers of Git tag objects. GIT ---
diff --git a/git-whatchanged.html b/git-whatchanged.html index efff6bc..83a8ff7 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html
@@ -1055,7 +1055,7 @@ <em>raw</em> </p> <div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as -stored in the commit object. Notably, the SHA1s are +stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and <em>parents</em> information show the true parent commits, without taking grafts nor history
diff --git a/git.html b/git.html index 0946630..2fcc2be 100644 --- a/git.html +++ b/git.html
@@ -2485,7 +2485,7 @@ </dt> <dd> <p> -are the 40-hexdigit SHA1 hashes, +are the 40-hexdigit SHA-1 hashes, </p> </dd> <dt class="hdlist1"> @@ -2659,7 +2659,7 @@ "version", represents a step in the project’s history, and each parent represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development.</p></div> -<div class="paragraph"><p>All objects are named by the SHA1 hash of their contents, normally +<div class="paragraph"><p>All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this @@ -2667,9 +2667,9 @@ <div class="paragraph"><p>When first created, objects are stored in individual files, but for efficiency may later be compressed together into "pack files".</p></div> <div class="paragraph"><p>Named pointers called refs mark interesting points in history. A ref -may contain the SHA1 name of an object or the name of another ref. Refs -with names beginning <code>ref/head/</code> contain the SHA1 name of the most -recent commit (or "head") of a branch under development. SHA1 names of +may contain the SHA-1 name of an object or the name of another ref. Refs +with names beginning <code>ref/head/</code> contain the SHA-1 name of the most +recent commit (or "head") of a branch under development. SHA-1 names of tags of interest are stored under <code>ref/tags/</code>. A special ref named <code>HEAD</code> contains the name of the currently checked-out branch.</p></div> <div class="paragraph"><p>The index file is initialized with a list of all paths and, for each @@ -2743,7 +2743,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-03-26 15:45:07 PDT +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/git.txt b/git.txt index 6a875f2..807a13c 100644 --- a/git.txt +++ b/git.txt
@@ -741,7 +741,7 @@ <old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>, - <old|new>-hex:: are the 40-hexdigit SHA1 hashes, + <old|new>-hex:: are the 40-hexdigit SHA-1 hashes, <old|new>-mode:: are the octal representation of the file modes. + The file parameters can point at the user's working file @@ -864,7 +864,7 @@ represents an immediately preceding step. Commits with more than one parent represent merges of independent lines of development. -All objects are named by the SHA1 hash of their contents, normally +All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits. Such names are globally unique. The entire history leading up to a commit can be vouched for by signing just that commit. A fourth object type, the tag, is provided for this @@ -874,9 +874,9 @@ efficiency may later be compressed together into "pack files". Named pointers called refs mark interesting points in history. A ref -may contain the SHA1 name of an object or the name of another ref. Refs -with names beginning `ref/head/` contain the SHA1 name of the most -recent commit (or "head") of a branch under development. SHA1 names of +may contain the SHA-1 name of an object or the name of another ref. Refs +with names beginning `ref/head/` contain the SHA-1 name of the most +recent commit (or "head") of a branch under development. SHA-1 names of tags of interest are stored under `ref/tags/`. A special ref named `HEAD` contains the name of the currently checked-out branch.
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index b5f28ba..c5e1aeb 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html
@@ -853,9 +853,9 @@ <td class="icon"> <div class="title">Note</div> </td> -<td class="content">An <em>object</em> is identified by its 160-bit SHA1 hash, aka <em>object name</em>, +<td class="content">An <em>object</em> is identified by its 160-bit SHA-1 hash, aka <em>object name</em>, and a reference to an object is always the 40-byte hex -representation of that SHA1 name. The files in the <code>refs</code> +representation of that SHA-1 name. The files in the <code>refs</code> subdirectory are expected to contain these hex references (usually with a final <code>\n</code> at the end), and you should thus expect to see a number of 41-byte files containing these @@ -1491,7 +1491,7 @@ already discussed, the <code>HEAD</code> branch is nothing but a symlink to one of these object pointers.</p></div> <div class="paragraph"><p>You can at any time create a new branch by just picking an arbitrary -point in the project history, and just writing the SHA1 name of that +point in the project history, and just writing the SHA-1 name of that object into a file under <code>.git/refs/heads/</code>. You can use any filename you want (and indeed, subdirectories), but the convention is that the "normal" branch is called <code>master</code>. That’s just a convention, though, @@ -1973,7 +1973,7 @@ etc.). After reading three trees into three stages, the paths that are the same in all three stages are <em>collapsed</em> into stage 0. Also paths that are the same in two of three stages are -collapsed into stage 0, taking the SHA1 from either stage 2 or +collapsed into stage 0, taking the SHA-1 from either stage 2 or stage 3, whichever is different from stage 1 (i.e. only one side changed from the common ancestor).</p></div> <div class="paragraph"><p>After <em>collapsing</em> operation, paths that are different in three @@ -2512,7 +2512,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/gitcore-tutorial.txt b/gitcore-tutorial.txt index 59c1c17..f538a87 100644 --- a/gitcore-tutorial.txt +++ b/gitcore-tutorial.txt
@@ -106,9 +106,9 @@ valid, though. [NOTE] -An 'object' is identified by its 160-bit SHA1 hash, aka 'object name', +An 'object' is identified by its 160-bit SHA-1 hash, aka 'object name', and a reference to an object is always the 40-byte hex -representation of that SHA1 name. The files in the `refs` +representation of that SHA-1 name. The files in the `refs` subdirectory are expected to contain these hex references (usually with a final `\n` at the end), and you should thus expect to see a number of 41-byte files containing these @@ -763,7 +763,7 @@ these object pointers. You can at any time create a new branch by just picking an arbitrary -point in the project history, and just writing the SHA1 name of that +point in the project history, and just writing the SHA-1 name of that object into a file under `.git/refs/heads/`. You can use any filename you want (and indeed, subdirectories), but the convention is that the "normal" branch is called `master`. That's just a convention, though, @@ -1233,7 +1233,7 @@ etc.). After reading three trees into three stages, the paths that are the same in all three stages are 'collapsed' into stage 0. Also paths that are the same in two of three stages are -collapsed into stage 0, taking the SHA1 from either stage 2 or +collapsed into stage 0, taking the SHA-1 from either stage 2 or stage 3, whichever is different from stage 1 (i.e. only one side changed from the common ancestor).
diff --git a/gitdiffcore.html b/gitdiffcore.html index 8c75f74..aa215a8 100644 --- a/gitdiffcore.html +++ b/gitdiffcore.html
@@ -873,7 +873,7 @@ <div class="paragraph"><p>For the purpose of breaking a filepair, diffcore-break examines the extent of changes between the contents of the files before and after modification (i.e. the contents that have "bcd1234…" -and "0123456…" as their SHA1 content ID, in the above +and "0123456…" as their SHA-1 content ID, in the above example). The amount of deletion of original contents and insertion of new material are added together, and if it exceeds the "break score", the filepair is broken into two. The break @@ -1051,7 +1051,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/gitdiffcore.txt b/gitdiffcore.txt index 4ed71c7..568d757 100644 --- a/gitdiffcore.txt +++ b/gitdiffcore.txt
@@ -108,7 +108,7 @@ For the purpose of breaking a filepair, diffcore-break examines the extent of changes between the contents of the files before and after modification (i.e. the contents that have "bcd1234..." -and "0123456..." as their SHA1 content ID, in the above +and "0123456..." as their SHA-1 content ID, in the above example). The amount of deletion of original contents and insertion of new material are added together, and if it exceeds the "break score", the filepair is broken into two. The break
diff --git a/gitglossary.html b/gitglossary.html index 96d086f..c1fe168 100644 --- a/gitglossary.html +++ b/gitglossary.html
@@ -950,14 +950,6 @@ (real) current branch to ask about in this state.</p></div> </dd> <dt class="hdlist1"> -<a id="def_dircache"></a>dircache -</dt> -<dd> -<p> - You are <strong>waaaaay</strong> behind. See <a href="#def_index">index</a>. -</p> -</dd> -<dt class="hdlist1"> <a id="def_directory"></a>directory </dt> <dd> @@ -976,16 +968,6 @@ </p> </dd> <dt class="hdlist1"> -<a id="def_ent"></a>ent -</dt> -<dd> -<p> - Favorite synonym to "<a href="#def_tree-ish">tree-ish</a>" by some total geeks. See - <a href="http://en.wikipedia.org/wiki/Ent_(Middle-earth">http://en.wikipedia.org/wiki/Ent_(Middle-earth</a>) for an in-depth - explanation. Avoid this term, not to confuse people. -</p> -</dd> -<dt class="hdlist1"> <a id="def_evil_merge"></a>evil merge </dt> <dd> @@ -1065,7 +1047,7 @@ </dt> <dd> <p> - In Git’s context, synonym to <a href="#def_object_name">object name</a>. + In Git’s context, synonym for <a href="#def_object_name">object name</a>. </p> </dd> <dt class="hdlist1"> @@ -1180,7 +1162,7 @@ <dd> <p> The unit of storage in Git. It is uniquely identified by the - <a href="#def_SHA1">SHA1</a> of its contents. Consequently, an + <a href="#def_SHA1">SHA-1</a> of its contents. Consequently, an object can not be changed. </p> </dd> @@ -1207,10 +1189,9 @@ </dt> <dd> <p> - The unique identifier of an <a href="#def_object">object</a>. The <a href="#def_hash">hash</a> - of the object’s contents using the Secure Hash Algorithm - 1 and usually represented by the 40 character hexadecimal encoding of - the <a href="#def_hash">hash</a> of the object. + The unique identifier of an <a href="#def_object">object</a>. The + object name is usually represented by a 40 character + hexadecimal string. Also colloquially called <a href="#def_SHA1">SHA-1</a>. </p> </dd> <dt class="hdlist1"> @@ -1229,8 +1210,7 @@ </dt> <dd> <p> - To <a href="#def_merge">merge</a> more than two <a href="#def_branch">branches</a>. Also denotes an - intelligent predator. + To <a href="#def_merge">merge</a> more than two <a href="#def_branch">branches</a>. </p> </dd> <dt class="hdlist1"> @@ -1270,7 +1250,7 @@ </dt> <dd> <p> - Pattern used to specify paths. + Pattern used to limit paths in Git commands. </p> <div class="paragraph"><p>Pathspecs are used on the command line of "git ls-files", "git ls-tree", "git add", "git grep", "git diff", "git checkout", @@ -1279,6 +1259,8 @@ worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows:</p></div> +<div class="openblock"> +<div class="content"> <div class="ulist"><ul> <li> <p> @@ -1299,11 +1281,12 @@ prefix will be matched against that pattern using fnmatch(3); in particular, <em>*</em> and <em>?</em> <em>can</em> match directory separators. </p> +</li> +</ul></div> +</div></div> <div class="paragraph"><p>For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg.</p></div> -</li> -</ul></div> <div class="paragraph"><p>A pathspec that begins with a colon <code>:</code> has special meaning. In the short form, the leading colon <code>:</code> is followed by zero or more "magic signature" letters (which optionally is terminated by another colon <code>:</code>), @@ -1316,25 +1299,10 @@ and a close parentheses <code>)</code>, and the remainder is the pattern to match against the path.</p></div> <div class="paragraph"><p>The "magic signature" consists of an ASCII symbol that is not -alphanumeric.</p></div> -<div class="openblock"> -<div class="content"> -<div class="dlist"><dl> -<dt class="hdlist1"> -top <code>/</code> -</dt> -<dd> -<p> - The magic word <code>top</code> (mnemonic: <code>/</code>) makes the pattern match - from the root of the working tree, even when you are running - the command from inside a subdirectory. -</p> -</dd> -</dl></div> -</div></div> -<div class="paragraph"><p>Currently only the slash <code>/</code> is recognized as the "magic signature", -but it is envisioned that we will support more types of magic in later -versions of Git.</p></div> +alphanumeric. Currently only the slash <code>/</code> is recognized as a +"magic signature": it makes the pattern match from the root of +the working tree, even when you are running the command from +inside a subdirectory.</p></div> <div class="paragraph"><p>A pathspec with only a colon means "there is no pathspec". This form should not be combined with other pathspec.</p></div> </dd> @@ -1435,7 +1403,7 @@ </dt> <dd> <p> - A 40-byte hex representation of a <a href="#def_SHA1">SHA1</a> or a name that + A 40-byte hex representation of a <a href="#def_SHA1">SHA-1</a> or a name that denotes a particular <a href="#def_object">object</a>. They may be stored in a file under <code>$GIT_DIR/refs/</code> directory, or in the <code>$GIT_DIR/packed-refs</code> file. @@ -1459,15 +1427,7 @@ <p> A "refspec" is used by <a href="#def_fetch">fetch</a> and <a href="#def_push">push</a> to describe the mapping between remote - <a href="#def_ref">ref</a> and local ref. They are combined with a colon in - the format <src>:<dst>, preceded by an optional plus sign, +. - For example: <code>git fetch $URL - refs/heads/master:refs/heads/origin</code> means "grab the master - <a href="#def_branch">branch</a> <a href="#def_head">head</a> from the $URL and store - it as my origin branch head". And <code>git push - $URL refs/heads/master:refs/heads/to-upstream</code> means "publish my - master branch head as to-upstream branch at $URL". See also - <a href="git-push.html">git-push(1)</a>. + <a href="#def_ref">ref</a> and local ref. </p> </dd> <dt class="hdlist1"> @@ -1533,11 +1493,12 @@ </p> </dd> <dt class="hdlist1"> -<a id="def_SHA1"></a>SHA1 +<a id="def_SHA1"></a>SHA-1 </dt> <dd> <p> - Synonym for <a href="#def_object_name">object name</a>. + "Secure Hash Algorithm 1"; a cryptographic hash function. + In the context of Git used as a synonym for <a href="#def_object_name">object name</a>. </p> </dd> <dt class="hdlist1"> @@ -1560,7 +1521,7 @@ </dt> <dd> <p> - Symbolic reference: instead of containing the <a href="#def_SHA1">SHA1</a> + Symbolic reference: instead of containing the <a href="#def_SHA1">SHA-1</a> id itself, it is of the format <em>ref: refs/some/thing</em> and when referenced, it recursively dereferences to this reference. <em><a href="#def_HEAD">HEAD</a></em> is a prime example of a symref. Symbolic
diff --git a/githooks.html b/githooks.html index bc81d4e..f7947c6 100644 --- a/githooks.html +++ b/githooks.html
@@ -829,7 +829,7 @@ configuration option <code>commit.template</code> is set); <code>merge</code> (if the commit is a merge or a <code>.git/MERGE_MSG</code> file exists); <code>squash</code> (if a <code>.git/SQUASH_MSG</code> file exists); or <code>commit</code>, followed by -a commit SHA1 (if a <code>-c</code>, <code>-C</code> or <code>--amend</code> option was given).</p></div> +a commit SHA-1 (if a <code>-c</code>, <code>-C</code> or <code>--amend</code> option was given).</p></div> <div class="paragraph"><p>If the exit status is non-zero, <em>git commit</em> will abort.</p></div> <div class="paragraph"><p>The purpose of the hook is to edit the message file in place, and it is not suppressed by the <code>--no-verify</code> option. A non-zero exit @@ -912,11 +912,11 @@ <div class="content"> <pre><code>refs/heads/master 67890 refs/heads/foreign 12345</code></pre> </div></div> -<div class="paragraph"><p>although the full, 40-character SHA1s would be supplied. If the foreign ref -does not yet exist the <code><remote SHA1></code> will be 40 <code>0</code>. If a ref is to be +<div class="paragraph"><p>although the full, 40-character SHA-1s would be supplied. If the foreign ref +does not yet exist the <code><remote SHA-1></code> will be 40 <code>0</code>. If a ref is to be deleted, the <code><local ref></code> will be supplied as <code>(delete)</code> and the <code><local -SHA1></code> will be 40 <code>0</code>. If the local commit was specified by something other -than a name which could be expanded (such as <code>HEAD~</code>, or a SHA1) it will be +SHA-1></code> will be 40 <code>0</code>. If the local commit was specified by something other +than a name which could be expanded (such as <code>HEAD~</code>, or a SHA-1) it will be supplied as it was originally given.</p></div> <div class="paragraph"><p>If this hook exits with a non-zero status, <em>git push</em> will abort without pushing anything. Information about why the push is rejected may be sent @@ -1096,7 +1096,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-03-19 16:06:22 PDT +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/githooks.txt b/githooks.txt index dc6693f..d48bf4d 100644 --- a/githooks.txt +++ b/githooks.txt
@@ -99,7 +99,7 @@ configuration option `commit.template` is set); `merge` (if the commit is a merge or a `.git/MERGE_MSG` file exists); `squash` (if a `.git/SQUASH_MSG` file exists); or `commit`, followed by -a commit SHA1 (if a `-c`, `-C` or `--amend` option was given). +a commit SHA-1 (if a `-c`, `-C` or `--amend` option was given). If the exit status is non-zero, 'git commit' will abort. @@ -196,11 +196,11 @@ refs/heads/master 67890 refs/heads/foreign 12345 -although the full, 40-character SHA1s would be supplied. If the foreign ref -does not yet exist the `<remote SHA1>` will be 40 `0`. If a ref is to be +although the full, 40-character SHA-1s would be supplied. If the foreign ref +does not yet exist the `<remote SHA-1>` will be 40 `0`. If a ref is to be deleted, the `<local ref>` will be supplied as `(delete)` and the `<local -SHA1>` will be 40 `0`. If the local commit was specified by something other -than a name which could be expanded (such as `HEAD~`, or a SHA1) it will be +SHA-1>` will be 40 `0`. If the local commit was specified by something other +than a name which could be expanded (such as `HEAD~`, or a SHA-1) it will be supplied as it was originally given. If this hook exits with a non-zero status, 'git push' will abort without
diff --git a/gitrepository-layout.html b/gitrepository-layout.html index 53404b5..c259c6c 100644 --- a/gitrepository-layout.html +++ b/gitrepository-layout.html
@@ -919,7 +919,7 @@ </dt> <dd> <p> - records the SHA1 of the object that replaces <code><obj-sha1></code>. + records the SHA-1 of the object that replaces <code><obj-sha1></code>. This is similar to info/grafts and is internally used and maintained by <a href="git-replace.html">git-replace(1)</a>. Such refs can be exchanged between repositories while grafts are not. @@ -1116,7 +1116,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/gitrepository-layout.txt b/gitrepository-layout.txt index f0eef76..2ad09f4 100644 --- a/gitrepository-layout.txt +++ b/gitrepository-layout.txt
@@ -106,7 +106,7 @@ from a remote repository. refs/replace/`<obj-sha1>`:: - records the SHA1 of the object that replaces `<obj-sha1>`. + records the SHA-1 of the object that replaces `<obj-sha1>`. This is similar to info/grafts and is internally used and maintained by linkgit:git-replace[1]. Such refs can be exchanged between repositories while grafts are not.
diff --git a/gitrevisions.html b/gitrevisions.html index 7c3aa55..d84b0ec 100644 --- a/gitrevisions.html +++ b/gitrevisions.html
@@ -765,7 +765,7 @@ <h2 id="_specifying_revisions">SPECIFYING REVISIONS</h2> <div class="sectionbody"> <div class="paragraph"><p>A revision parameter <em><rev></em> typically, but not necessarily, names a -commit object. It uses what is called an <em>extended SHA1</em> +commit object. It uses what is called an <em>extended SHA-1</em> syntax. Here are various ways to spell object names. The ones listed near the end of this list name trees and blobs contained in a commit.</p></div> @@ -775,7 +775,7 @@ </dt> <dd> <p> - The full SHA1 object name (40-byte hexadecimal string), or + The full SHA-1 object name (40-byte hexadecimal string), or a leading substring that is unique within the repository. E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both name the same commit object if there is no other object in
diff --git a/gittutorial-2.html b/gittutorial-2.html index 0aaf332..50fa86d 100644 --- a/gittutorial-2.html +++ b/gittutorial-2.html
@@ -785,16 +785,16 @@ <div class="paragraph"><p>What are the 7 digits of hex that Git responded to the commit with?</p></div> <div class="paragraph"><p>We saw in part one of the tutorial that commits have names like this. It turns out that every object in the Git history is stored under -a 40-digit hex name. That name is the SHA1 hash of the object’s +a 40-digit hex name. That name is the SHA-1 hash of the object’s contents; among other things, this ensures that Git will never store -the same data twice (since identical data is given an identical SHA1 +the same data twice (since identical data is given an identical SHA-1 name), and that the contents of a Git object will never change (since that would change the object’s name as well). The 7 char hex strings here are simply the abbreviation of such 40 character long strings. Abbreviations can be used everywhere where the 40 character strings can be used, so long as they are unambiguous.</p></div> <div class="paragraph"><p>It is expected that the content of the commit object you created while -following the example above generates a different SHA1 hash than +following the example above generates a different SHA-1 hash than the one shown above because the commit object records the time when it was created and the name of the person performing the commit.</p></div> <div class="paragraph"><p>We can ask Git about this particular object with the <code>cat-file</code> @@ -816,13 +816,13 @@ a file. In addition, a tree can also refer to other tree objects, thus creating a directory hierarchy. You can examine the contents of any tree using ls-tree (remember that a long enough initial portion -of the SHA1 will also work):</p></div> +of the SHA-1 will also work):</p></div> <div class="listingblock"> <div class="content"> <pre><code>$ git ls-tree 92b8b694 100644 blob 3b18e512dba79e4c8300dd08aeb37f8e728b8dad file.txt</code></pre> </div></div> -<div class="paragraph"><p>Thus we see that this tree has one file in it. The SHA1 hash is a +<div class="paragraph"><p>Thus we see that this tree has one file in it. The SHA-1 hash is a reference to that file’s data:</p></div> <div class="listingblock"> <div class="content"> @@ -838,7 +838,7 @@ <div class="paragraph"><p>Note that this is the old file data; so the object that Git named in its response to the initial tree was a tree with a snapshot of the directory state that was recorded by the first commit.</p></div> -<div class="paragraph"><p>All of these objects are stored under their SHA1 names inside the Git +<div class="paragraph"><p>All of these objects are stored under their SHA-1 names inside the Git directory:</p></div> <div class="listingblock"> <div class="content"> @@ -871,7 +871,7 @@ </div></div> <div class="paragraph"><p>As you can see, this tells us which branch we’re currently on, and it tells us this by naming a file under the .git directory, which itself -contains a SHA1 name referring to a commit object, which we can +contains a SHA-1 name referring to a commit object, which we can examine with cat-file:</p></div> <div class="listingblock"> <div class="content"> @@ -951,7 +951,7 @@ </ul></div> <div class="paragraph"><p>Note, by the way, that lots of commands take a tree as an argument. But as we can see above, a tree can be referred to in many different -ways—by the SHA1 name for that tree, by the name of a commit that +ways—by the SHA-1 name for that tree, by the name of a commit that refers to the tree, by the name of a branch whose head refers to that tree, etc.--and most such commands can accept any of these names.</p></div> <div class="paragraph"><p>In command synopses, the word "tree-ish" is sometimes used to @@ -1167,7 +1167,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/gittutorial-2.txt b/gittutorial-2.txt index 94c906e..3109ea8 100644 --- a/gittutorial-2.txt +++ b/gittutorial-2.txt
@@ -46,9 +46,9 @@ We saw in part one of the tutorial that commits have names like this. It turns out that every object in the Git history is stored under -a 40-digit hex name. That name is the SHA1 hash of the object's +a 40-digit hex name. That name is the SHA-1 hash of the object's contents; among other things, this ensures that Git will never store -the same data twice (since identical data is given an identical SHA1 +the same data twice (since identical data is given an identical SHA-1 name), and that the contents of a Git object will never change (since that would change the object's name as well). The 7 char hex strings here are simply the abbreviation of such 40 character long strings. @@ -56,7 +56,7 @@ can be used, so long as they are unambiguous. It is expected that the content of the commit object you created while -following the example above generates a different SHA1 hash than +following the example above generates a different SHA-1 hash than the one shown above because the commit object records the time when it was created and the name of the person performing the commit. @@ -80,14 +80,14 @@ a file. In addition, a tree can also refer to other tree objects, thus creating a directory hierarchy. You can examine the contents of any tree using ls-tree (remember that a long enough initial portion -of the SHA1 will also work): +of the SHA-1 will also work): ------------------------------------------------ $ git ls-tree 92b8b694 100644 blob 3b18e512dba79e4c8300dd08aeb37f8e728b8dad file.txt ------------------------------------------------ -Thus we see that this tree has one file in it. The SHA1 hash is a +Thus we see that this tree has one file in it. The SHA-1 hash is a reference to that file's data: ------------------------------------------------ @@ -106,7 +106,7 @@ its response to the initial tree was a tree with a snapshot of the directory state that was recorded by the first commit. -All of these objects are stored under their SHA1 names inside the Git +All of these objects are stored under their SHA-1 names inside the Git directory: ------------------------------------------------ @@ -142,7 +142,7 @@ As you can see, this tells us which branch we're currently on, and it tells us this by naming a file under the .git directory, which itself -contains a SHA1 name referring to a commit object, which we can +contains a SHA-1 name referring to a commit object, which we can examine with cat-file: ------------------------------------------------ @@ -208,7 +208,7 @@ Note, by the way, that lots of commands take a tree as an argument. But as we can see above, a tree can be referred to in many different -ways--by the SHA1 name for that tree, by the name of a commit that +ways--by the SHA-1 name for that tree, by the name of a commit that refers to the tree, by the name of a branch whose head refers to that tree, etc.--and most such commands can accept any of these names.
diff --git a/glossary-content.txt b/glossary-content.txt index 2478a39..ce3e4fa 100644 --- a/glossary-content.txt +++ b/glossary-content.txt
@@ -117,9 +117,6 @@ current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state. -[[def_dircache]]dircache:: - You are *waaaaay* behind. See <<def_index,index>>. - [[def_directory]]directory:: The list you get with "ls" :-) @@ -128,11 +125,6 @@ it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>. -[[def_ent]]ent:: - Favorite synonym to "<<def_tree-ish,tree-ish>>" by some total geeks. See - http://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth - explanation. Avoid this term, not to confuse people. - [[def_evil_merge]]evil merge:: An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>. @@ -174,7 +166,7 @@ created. Configured via the `.git/info/grafts` file. [[def_hash]]hash:: - In Git's context, synonym to <<def_object_name,object name>>. + In Git's context, synonym for <<def_object_name,object name>>. [[def_head]]head:: A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a @@ -246,7 +238,7 @@ [[def_object]]object:: The unit of storage in Git. It is uniquely identified by the - <<def_SHA1,SHA1>> of its contents. Consequently, an + <<def_SHA1,SHA-1>> of its contents. Consequently, an object can not be changed. [[def_object_database]]object database:: @@ -258,10 +250,9 @@ Synonym for <<def_object_name,object name>>. [[def_object_name]]object name:: - The unique identifier of an <<def_object,object>>. The <<def_hash,hash>> - of the object's contents using the Secure Hash Algorithm - 1 and usually represented by the 40 character hexadecimal encoding of - the <<def_hash,hash>> of the object. + The unique identifier of an <<def_object,object>>. The + object name is usually represented by a 40 character + hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>. [[def_object_type]]object type:: One of the identifiers "<<def_commit_object,commit>>", @@ -270,8 +261,7 @@ <<def_object,object>>. [[def_octopus]]octopus:: - To <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an - intelligent predator. + To <<def_merge,merge>> more than two <<def_branch,branches>>. [[def_origin]]origin:: The default upstream <<def_repository,repository>>. Most projects have @@ -291,7 +281,7 @@ pack. [[def_pathspec]]pathspec:: - Pattern used to specify paths. + Pattern used to limit paths in Git commands. + Pathspecs are used on the command line of "git ls-files", "git ls-tree", "git add", "git grep", "git diff", "git checkout", @@ -300,6 +290,8 @@ worktree. See the documentation of each command for whether paths are relative to the current directory or toplevel. The pathspec syntax is as follows: ++ +-- * any path matches itself * the pathspec up to the last slash represents a @@ -309,11 +301,12 @@ of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators. + +-- + For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg. - + A pathspec that begins with a colon `:` has special meaning. In the short form, the leading colon `:` is followed by zero or more "magic @@ -329,18 +322,10 @@ against the path. + The "magic signature" consists of an ASCII symbol that is not -alphanumeric. -+ --- -top `/`;; - The magic word `top` (mnemonic: `/`) makes the pattern match - from the root of the working tree, even when you are running - the command from inside a subdirectory. --- -+ -Currently only the slash `/` is recognized as the "magic signature", -but it is envisioned that we will support more types of magic in later -versions of Git. +alphanumeric. Currently only the slash `/` is recognized as a +"magic signature": it makes the pattern match from the root of +the working tree, even when you are running the command from +inside a subdirectory. + A pathspec with only a colon means "there is no pathspec". This form should not be combined with other pathspec. @@ -398,7 +383,7 @@ to the result. [[def_ref]]ref:: - A 40-byte hex representation of a <<def_SHA1,SHA1>> or a name that + A 40-byte hex representation of a <<def_SHA1,SHA-1>> or a name that denotes a particular <<def_object,object>>. They may be stored in a file under `$GIT_DIR/refs/` directory, or in the `$GIT_DIR/packed-refs` file. @@ -412,15 +397,7 @@ [[def_refspec]]refspec:: A "refspec" is used by <<def_fetch,fetch>> and <<def_push,push>> to describe the mapping between remote - <<def_ref,ref>> and local ref. They are combined with a colon in - the format <src>:<dst>, preceded by an optional plus sign, +. - For example: `git fetch $URL - refs/heads/master:refs/heads/origin` means "grab the master - <<def_branch,branch>> <<def_head,head>> from the $URL and store - it as my origin branch head". And `git push - $URL refs/heads/master:refs/heads/to-upstream` means "publish my - master branch head as to-upstream branch at $URL". See also - linkgit:git-push[1]. + <<def_ref,ref>> and local ref. [[def_remote_tracking_branch]]remote-tracking branch:: A regular Git <<def_branch,branch>> that is used to follow changes from @@ -454,8 +431,9 @@ [[def_SCM]]SCM:: Source code management (tool). -[[def_SHA1]]SHA1:: - Synonym for <<def_object_name,object name>>. +[[def_SHA1]]SHA-1:: + "Secure Hash Algorithm 1"; a cryptographic hash function. + In the context of Git used as a synonym for <<def_object_name,object name>>. [[def_shallow_repository]]shallow repository:: A shallow <<def_repository,repository>> has an incomplete @@ -469,7 +447,7 @@ its history can be later deepened with linkgit:git-fetch[1]. [[def_symref]]symref:: - Symbolic reference: instead of containing the <<def_SHA1,SHA1>> + Symbolic reference: instead of containing the <<def_SHA1,SHA-1>> id itself, it is of the format 'ref: refs/some/thing' and when referenced, it recursively dereferences to this reference. '<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index b2379a2..c5584d7 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html
@@ -743,7 +743,7 @@ > Did not help still the repository look for this object? > Any one know how can I track this object and understand which file is it</code></pre> </div></div> -<div class="paragraph"><p>So exactly <strong>because</strong> the SHA1 hash is cryptographically secure, the hash +<div class="paragraph"><p>So exactly <strong>because</strong> the SHA-1 hash is cryptographically secure, the hash itself doesn’t actually tell you anything, in order to fix a corrupt object you basically have to find the "original source" for it.</p></div> <div class="paragraph"><p>The easiest way to do that is almost always to have backups, and find the @@ -768,7 +768,7 @@ > ib]$ mv .git/objects/4b/9458b3786228369c63936db65827de3cc06200 ../</code></pre> </div></div> <div class="paragraph"><p>This is the right thing to do, although it’s usually best to save it under -it’s full SHA1 name (you just dropped the "4b" from the result ;).</p></div> +it’s full SHA-1 name (you just dropped the "4b" from the result ;).</p></div> <div class="paragraph"><p>Let’s see what that tells us:</p></div> <div class="listingblock"> <div class="content"> @@ -813,7 +813,7 @@ <div class="content"> <pre><code>git hash-object -w my-magic-file</code></pre> </div></div> -<div class="paragraph"><p>again, and if it outputs the missing SHA1 (4b945..) you’re now all done!</p></div> +<div class="paragraph"><p>again, and if it outputs the missing SHA-1 (4b945..) you’re now all done!</p></div> <div class="paragraph"><p>But that’s the really lucky case, so let’s assume that it was some older version that was broken. How do you tell which version it was?</p></div> <div class="paragraph"><p>The easiest way to do it is to do</p></div> @@ -876,7 +876,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-03-13 12:07:57 PDT +Last updated 2013-04-21 19:26:01 PDT </div> </div> </body>
diff --git a/howto/recover-corrupted-blob-object.txt b/howto/recover-corrupted-blob-object.txt index 6d362ce..1b3b188 100644 --- a/howto/recover-corrupted-blob-object.txt +++ b/howto/recover-corrupted-blob-object.txt
@@ -15,7 +15,7 @@ > Any one know how can I track this object and understand which file is it ----------------------------------------------------------- -So exactly *because* the SHA1 hash is cryptographically secure, the hash +So exactly *because* the SHA-1 hash is cryptographically secure, the hash itself doesn't actually tell you anything, in order to fix a corrupt object you basically have to find the "original source" for it. @@ -44,7 +44,7 @@ ----------------------------------------------------------- This is the right thing to do, although it's usually best to save it under -it's full SHA1 name (you just dropped the "4b" from the result ;). +it's full SHA-1 name (you just dropped the "4b" from the result ;). Let's see what that tells us: @@ -89,7 +89,7 @@ git hash-object -w my-magic-file -again, and if it outputs the missing SHA1 (4b945..) you're now all done! +again, and if it outputs the missing SHA-1 (4b945..) you're now all done! But that's the really lucky case, so let's assume that it was some older version that was broken. How do you tell which version it was?
diff --git a/pretty-formats.txt b/pretty-formats.txt index afac703..f5b50dc 100644 --- a/pretty-formats.txt +++ b/pretty-formats.txt
@@ -75,7 +75,7 @@ * 'raw' + The 'raw' format shows the entire commit exactly as -stored in the commit object. Notably, the SHA1s are +stored in the commit object. Notably, the SHA-1s are displayed in full, regardless of whether --abbrev or --no-abbrev are used, and 'parents' information show the true parent commits, without taking grafts nor history
diff --git a/revisions.txt b/revisions.txt index 8855b1a..a8ff691 100644 --- a/revisions.txt +++ b/revisions.txt
@@ -2,13 +2,13 @@ -------------------- A revision parameter '<rev>' typically, but not necessarily, names a -commit object. It uses what is called an 'extended SHA1' +commit object. It uses what is called an 'extended SHA-1' syntax. Here are various ways to spell object names. The ones listed near the end of this list name trees and blobs contained in a commit. '<sha1>', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e':: - The full SHA1 object name (40-byte hexadecimal string), or + The full SHA-1 object name (40-byte hexadecimal string), or a leading substring that is unique within the repository. E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both name the same commit object if there is no other object in
diff --git a/technical/api-sha1-array.html b/technical/api-sha1-array.html index 2bc0d10..50aef61 100644 --- a/technical/api-sha1-array.html +++ b/technical/api-sha1-array.html
@@ -736,7 +736,7 @@ <div id="content"> <div id="preamble"> <div class="sectionbody"> -<div class="paragraph"><p>The sha1-array API provides storage and manipulation of sets of SHA1 +<div class="paragraph"><p>The sha1-array API provides storage and manipulation of sets of SHA-1 identifiers. The emphasis is on storage and processing efficiency, making them suitable for large lists. Note that the ordering of items is not preserved over some operations.</p></div> @@ -751,7 +751,7 @@ </dt> <dd> <p> - A single array of SHA1 hashes. This should be initialized by + A single array of SHA-1 hashes. This should be initialized by assignment from <code>SHA1_ARRAY_INIT</code>. The <code>sha1</code> member contains the actual data. The <code>nr</code> member contains the number of items in the set. The <code>alloc</code> and <code>sorted</code> members are used internally, @@ -849,7 +849,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-09-18 15:30:10 PDT +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/technical/api-sha1-array.txt b/technical/api-sha1-array.txt index 45d1c51..3e75497 100644 --- a/technical/api-sha1-array.txt +++ b/technical/api-sha1-array.txt
@@ -1,7 +1,7 @@ sha1-array API ============== -The sha1-array API provides storage and manipulation of sets of SHA1 +The sha1-array API provides storage and manipulation of sets of SHA-1 identifiers. The emphasis is on storage and processing efficiency, making them suitable for large lists. Note that the ordering of items is not preserved over some operations. @@ -11,7 +11,7 @@ `struct sha1_array`:: - A single array of SHA1 hashes. This should be initialized by + A single array of SHA-1 hashes. This should be initialized by assignment from `SHA1_ARRAY_INIT`. The `sha1` member contains the actual data. The `nr` member contains the number of items in the set. The `alloc` and `sorted` members are used internally,
diff --git a/technical/pack-format.html b/technical/pack-format.html index 372c70c..1cd3701 100644 --- a/technical/pack-format.html +++ b/technical/pack-format.html
@@ -791,7 +791,7 @@ </li> <li> <p> -The trailer records 20-byte SHA1 checksum of all of the above. +The trailer records 20-byte SHA-1 checksum of all of the above. </p> </li> </ul></div> @@ -832,12 +832,12 @@ </p> <div class="literalblock"> <div class="content"> -<pre><code>A copy of the 20-byte SHA1 checksum at the end of +<pre><code>A copy of the 20-byte SHA-1 checksum at the end of corresponding packfile.</code></pre> </div></div> <div class="literalblock"> <div class="content"> -<pre><code>20-byte SHA1-checksum of all of the above.</code></pre> +<pre><code>20-byte SHA-1-checksum of all of the above.</code></pre> </div></div> </li> </ul></div> @@ -890,7 +890,7 @@ If it is not DELTA, then deflated bytes (the size above is the size before compression). If it is REF_DELTA, then - 20-byte base object name SHA1 (the size above is the + 20-byte base object name SHA-1 (the size above is the size of the delta data that follows). delta data, deflated. If it is OFS_DELTA, then @@ -937,7 +937,7 @@ </li> <li> <p> -A table of sorted 20-byte SHA1 object names. These are +A table of sorted 20-byte SHA-1 object names. These are packed together without offset values to reduce the cache footprint of the binary search for a specific object name. </p> @@ -972,12 +972,12 @@ </p> <div class="literalblock"> <div class="content"> -<pre><code>A copy of the 20-byte SHA1 checksum at the end of +<pre><code>A copy of the 20-byte SHA-1 checksum at the end of corresponding packfile.</code></pre> </div></div> <div class="literalblock"> <div class="content"> -<pre><code>20-byte SHA1-checksum of all of the above.</code></pre> +<pre><code>20-byte SHA-1-checksum of all of the above.</code></pre> </div></div> </li> </ul></div> @@ -987,7 +987,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-04-12 14:32:32 PDT +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/technical/pack-format.txt b/technical/pack-format.txt index a37f137..8e5bf60 100644 --- a/technical/pack-format.txt +++ b/technical/pack-format.txt
@@ -34,7 +34,7 @@ Observation: length of each object is encoded in a variable length format and is not constrained to 32-bit or anything. - - The trailer records 20-byte SHA1 checksum of all of the above. + - The trailer records 20-byte SHA-1 checksum of all of the above. == Original (version 1) pack-*.idx files have the following format: @@ -55,10 +55,10 @@ - The file is concluded with a trailer: - A copy of the 20-byte SHA1 checksum at the end of + A copy of the 20-byte SHA-1 checksum at the end of corresponding packfile. - 20-byte SHA1-checksum of all of the above. + 20-byte SHA-1-checksum of all of the above. Pack Idx file: @@ -106,7 +106,7 @@ If it is not DELTA, then deflated bytes (the size above is the size before compression). If it is REF_DELTA, then - 20-byte base object name SHA1 (the size above is the + 20-byte base object name SHA-1 (the size above is the size of the delta data that follows). delta data, deflated. If it is OFS_DELTA, then @@ -135,7 +135,7 @@ - A 256-entry fan-out table just like v1. - - A table of sorted 20-byte SHA1 object names. These are + - A table of sorted 20-byte SHA-1 object names. These are packed together without offset values to reduce the cache footprint of the binary search for a specific object name. @@ -156,7 +156,7 @@ - The same trailer as a v1 pack file: - A copy of the 20-byte SHA1 checksum at the end of + A copy of the 20-byte SHA-1 checksum at the end of corresponding packfile. - 20-byte SHA1-checksum of all of the above. + 20-byte SHA-1-checksum of all of the above.
diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html index c2891e5..1d2bb76 100644 --- a/technical/pack-heuristics.html +++ b/technical/pack-heuristics.html
@@ -847,7 +847,7 @@ <div class="content"> <pre><code><linus> The "magic" is actually in theory totally arbitrary. ANY order will give you a working pack, but no, it's not - ordered by SHA1.</code></pre> + ordered by SHA-1.</code></pre> </div></div> <div class="literalblock"> <div class="content"> @@ -1345,7 +1345,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/technical/pack-heuristics.txt b/technical/pack-heuristics.txt index dbdf7ba..8b7ae1c 100644 --- a/technical/pack-heuristics.txt +++ b/technical/pack-heuristics.txt
@@ -89,7 +89,7 @@ <linus> The "magic" is actually in theory totally arbitrary. ANY order will give you a working pack, but no, it's not - ordered by SHA1. + ordered by SHA-1. Before talking about the ordering for the sliding delta window, let's talk about the recency order. That's more
diff --git a/technical/shallow.html b/technical/shallow.html index d9b4036..ca07b35 100644 --- a/technical/shallow.html +++ b/technical/shallow.html
@@ -743,7 +743,7 @@ repo, and therefore grafts are introduced pretending that these commits have no parents.</p></div> </div></div> -<div class="paragraph"><p>The basic idea is to write the SHA1s of shallow commits into +<div class="paragraph"><p>The basic idea is to write the SHA-1s of shallow commits into $GIT_DIR/shallow, and handle its contents like the contents of $GIT_DIR/info/grafts (with the difference that shallow cannot contain parent information).</p></div> @@ -751,7 +751,7 @@ even the config, since the user should not touch that file at all (even throughout development of the shallow clone, it was never manually edited!).</p></div> -<div class="paragraph"><p>Each line contains exactly one SHA1. When read, a commit_graft +<div class="paragraph"><p>Each line contains exactly one SHA-1. When read, a commit_graft will be constructed, which has nr_parent < 0 to make it easier to discern from user provided grafts.</p></div> <div class="paragraph"><p>Since fsck-objects relies on the library to read the objects, @@ -807,7 +807,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-01 13:36:31 PST +Last updated 2013-04-21 19:25:38 PDT </div> </div> </body>
diff --git a/technical/shallow.txt b/technical/shallow.txt index ea2f69f..5183b15 100644 --- a/technical/shallow.txt +++ b/technical/shallow.txt
@@ -8,7 +8,7 @@ these commits have no parents. ********************************************************* -The basic idea is to write the SHA1s of shallow commits into +The basic idea is to write the SHA-1s of shallow commits into $GIT_DIR/shallow, and handle its contents like the contents of $GIT_DIR/info/grafts (with the difference that shallow cannot contain parent information). @@ -18,7 +18,7 @@ at all (even throughout development of the shallow clone, it was never manually edited!). -Each line contains exactly one SHA1. When read, a commit_graft +Each line contains exactly one SHA-1. When read, a commit_graft will be constructed, which has nr_parent < 0 to make it easier to discern from user provided grafts.
diff --git a/user-manual.html b/user-manual.html index 2283ff6..0d798b7 100644 --- a/user-manual.html +++ b/user-manual.html
@@ -2065,10 +2065,6 @@ branch --set-upstream-to</code> that sets what remote tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state.</p></dd><dt><span class="term"> -<a name="def_dircache"></a>dircache -</span></dt><dd> - You are <span class="strong"><strong>waaaaay</strong></span> behind. See <a class="link" href="#def_index">index</a>. -</dd><dt><span class="term"> <a name="def_directory"></a>directory </span></dt><dd> The list you get with "ls" :-) @@ -2079,12 +2075,6 @@ it contains modifications which have not been <a class="link" href="#def_commit">committed</a> to the current <a class="link" href="#def_branch">branch</a>. </dd><dt><span class="term"> -<a name="def_ent"></a>ent -</span></dt><dd> - Favorite synonym to "<a class="link" href="#def_tree-ish">tree-ish</a>" by some total geeks. See - <a class="ulink" href="http://en.wikipedia.org/wiki/Ent_(Middle-earth" target="_top">http://en.wikipedia.org/wiki/Ent_(Middle-earth</a>) for an in-depth - explanation. Avoid this term, not to confuse people. -</dd><dt><span class="term"> <a name="def_evil_merge"></a>evil merge </span></dt><dd> An evil merge is a <a class="link" href="#def_merge">merge</a> that introduces changes that @@ -2134,7 +2124,7 @@ </dd><dt><span class="term"> <a name="def_hash"></a>hash </span></dt><dd> - In Git’s context, synonym to <a class="link" href="#def_object_name">object name</a>. + In Git’s context, synonym for <a class="link" href="#def_object_name">object name</a>. </dd><dt><span class="term"> <a name="def_head"></a>head </span></dt><dd> @@ -2212,7 +2202,7 @@ <a name="def_object"></a>object </span></dt><dd> The unit of storage in Git. It is uniquely identified by the - <a class="link" href="#def_SHA1">SHA1</a> of its contents. Consequently, an + <a class="link" href="#def_SHA1">SHA-1</a> of its contents. Consequently, an object can not be changed. </dd><dt><span class="term"> <a name="def_object_database"></a>object database @@ -2227,10 +2217,9 @@ </dd><dt><span class="term"> <a name="def_object_name"></a>object name </span></dt><dd> - The unique identifier of an <a class="link" href="#def_object">object</a>. The <a class="link" href="#def_hash">hash</a> - of the object’s contents using the Secure Hash Algorithm - 1 and usually represented by the 40 character hexadecimal encoding of - the <a class="link" href="#def_hash">hash</a> of the object. + The unique identifier of an <a class="link" href="#def_object">object</a>. The + object name is usually represented by a 40 character + hexadecimal string. Also colloquially called <a class="link" href="#def_SHA1">SHA-1</a>. </dd><dt><span class="term"> <a name="def_object_type"></a>object type </span></dt><dd> @@ -2241,8 +2230,7 @@ </dd><dt><span class="term"> <a name="def_octopus"></a>octopus </span></dt><dd> - To <a class="link" href="#def_merge">merge</a> more than two <a class="link" href="#def_branch">branches</a>. Also denotes an - intelligent predator. + To <a class="link" href="#def_merge">merge</a> more than two <a class="link" href="#def_branch">branches</a>. </dd><dt><span class="term"> <a name="def_origin"></a>origin </span></dt><dd> @@ -2266,7 +2254,7 @@ </dd><dt><span class="term"> <a name="def_pathspec"></a>pathspec </span></dt><dd><p class="simpara"> - Pattern used to specify paths. + Pattern used to limit paths in Git commands. </p><p class="simpara">Pathspecs are used on the command line of "git ls-files", "git ls-tree", "git add", "git grep", "git diff", "git checkout", and many other commands to @@ -2279,14 +2267,14 @@ the pathspec up to the last slash represents a directory prefix. The scope of that pathspec is limited to that subtree. -</li><li class="listitem"><p class="simpara"> +</li><li class="listitem"> the rest of the pathspec is a pattern for the remainder of the pathname. Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, <span class="emphasis"><em>*</em></span> and <span class="emphasis"><em>?</em></span> <span class="emphasis"><em>can</em></span> match directory separators. -</p><p class="simpara">For example, Documentation/*.jpg will match all .jpg files +</li></ul></div><p class="simpara">For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, -including Documentation/chapter_1/figure_1.jpg.</p></li></ul></div><p class="simpara">A pathspec that begins with a colon <code class="literal">:</code> has special meaning. In the +including Documentation/chapter_1/figure_1.jpg.</p><p class="simpara">A pathspec that begins with a colon <code class="literal">:</code> has special meaning. In the short form, the leading colon <code class="literal">:</code> is followed by zero or more "magic signature" letters (which optionally is terminated by another colon <code class="literal">:</code>), and the remainder is the pattern to match against the path. The optional @@ -2296,15 +2284,10 @@ parenthesis <code class="literal">(</code>, a comma-separated list of zero or more "magic words", and a close parentheses <code class="literal">)</code>, and the remainder is the pattern to match against the path.</p><p class="simpara">The "magic signature" consists of an ASCII symbol that is not -alphanumeric.</p><div class="variablelist"><dl><dt><span class="term"> -top <code class="literal">/</code> -</span></dt><dd> - The magic word <code class="literal">top</code> (mnemonic: <code class="literal">/</code>) makes the pattern match - from the root of the working tree, even when you are running - the command from inside a subdirectory. -</dd></dl></div><p class="simpara">Currently only the slash <code class="literal">/</code> is recognized as the "magic signature", -but it is envisioned that we will support more types of magic in later -versions of Git.</p><p class="simpara">A pathspec with only a colon means "there is no pathspec". This form +alphanumeric. Currently only the slash <code class="literal">/</code> is recognized as a +"magic signature": it makes the pattern match from the root of +the working tree, even when you are running the command from +inside a subdirectory.</p><p class="simpara">A pathspec with only a colon means "there is no pathspec". This form should not be combined with other pathspec.</p></dd><dt><span class="term"> <a name="def_parent"></a>parent </span></dt><dd> @@ -2368,7 +2351,7 @@ </dd><dt><span class="term"> <a name="def_ref"></a>ref </span></dt><dd> - A 40-byte hex representation of a <a class="link" href="#def_SHA1">SHA1</a> or a name that + A 40-byte hex representation of a <a class="link" href="#def_SHA1">SHA-1</a> or a name that denotes a particular <a class="link" href="#def_object">object</a>. They may be stored in a file under <code class="literal">$GIT_DIR/refs/</code> directory, or in the <code class="literal">$GIT_DIR/packed-refs</code> file. @@ -2384,15 +2367,7 @@ </span></dt><dd> A "refspec" is used by <a class="link" href="#def_fetch">fetch</a> and <a class="link" href="#def_push">push</a> to describe the mapping between remote - <a class="link" href="#def_ref">ref</a> and local ref. They are combined with a colon in - the format <src>:<dst>, preceded by an optional plus sign, +. - For example: <code class="literal">git fetch $URL - refs/heads/master:refs/heads/origin</code> means "grab the master - <a class="link" href="#def_branch">branch</a> <a class="link" href="#def_head">head</a> from the $URL and store - it as my origin branch head". And <code class="literal">git push - $URL refs/heads/master:refs/heads/to-upstream</code> means "publish my - master branch head as to-upstream branch at $URL". See also - <a class="ulink" href="git-push.html" target="_top">git-push(1)</a>. + <a class="link" href="#def_ref">ref</a> and local ref. </dd><dt><span class="term"> <a name="def_remote_tracking_branch"></a>remote-tracking branch </span></dt><dd> @@ -2432,9 +2407,10 @@ </span></dt><dd> Source code management (tool). </dd><dt><span class="term"> -<a name="def_SHA1"></a>SHA1 +<a name="def_SHA1"></a>SHA-1 </span></dt><dd> - Synonym for <a class="link" href="#def_object_name">object name</a>. + "Secure Hash Algorithm 1"; a cryptographic hash function. + In the context of Git used as a synonym for <a class="link" href="#def_object_name">object name</a>. </dd><dt><span class="term"> <a name="def_shallow_repository"></a>shallow repository </span></dt><dd> @@ -2449,7 +2425,7 @@ </dd><dt><span class="term"> <a name="def_symref"></a>symref </span></dt><dd> - Symbolic reference: instead of containing the <a class="link" href="#def_SHA1">SHA1</a> + Symbolic reference: instead of containing the <a class="link" href="#def_SHA1">SHA-1</a> id itself, it is of the format <span class="emphasis"><em>ref: refs/some/thing</em></span> and when referenced, it recursively dereferences to this reference. <span class="emphasis"><em><a class="link" href="#def_HEAD">HEAD</a></em></span> is a prime example of a symref. Symbolic
